Merge commit 'EMACS_23_3' into deb/emacs23/d/sid/upstream

Merge commit 'EMACS_23_3' into deb/emacs23/d/sid/upstream

Conflicts:
	.bzrignore
	INSTALL.BZR
	admin/ChangeLog
	admin/README
	admin/admin.el
	admin/alloc-colors.c
	admin/build-configs
	admin/charsets/Makefile
	admin/charsets/big5.awk
	admin/charsets/compact.awk
	admin/charsets/cp51932.awk
	admin/charsets/cp932.awk
	admin/charsets/eucjp-ms.awk
	admin/charsets/gb180302.awk
	admin/charsets/gb180304.awk
	admin/charsets/mapconv
	admin/charsets/mapfiles/README
	admin/charsets/mule-charsets.el
	admin/cus-test.el
	admin/diff-tar-files
	admin/make-announcement
	admin/make-emacs
	admin/notes/bugtracker
	admin/notes/copyright
	admin/notes/font-backend
	admin/notes/lel-TODO
	admin/notes/multi-tty
	admin/notes/unicode
	admin/nt/README-UNDUMP.W32
	admin/nt/README-ftp-server
	admin/nt/README.W32
	admin/nt/makedist.bat
	admin/quick-install-emacs
	admin/unidata/Makefile.in
	admin/unidata/makefile.w32-in
	admin/unidata/unidata-gen.el
	doc/emacs/ChangeLog
	doc/emacs/Makefile.in
	doc/emacs/abbrevs.texi
	doc/emacs/ack.texi
	doc/emacs/anti.texi
	doc/emacs/arevert-xtra.texi
	doc/emacs/basic.texi
	doc/emacs/buffers.texi
	doc/emacs/building.texi
	doc/emacs/cal-xtra.texi
	doc/emacs/calendar.texi
	doc/emacs/cmdargs.texi
	doc/emacs/commands.texi
	doc/emacs/custom.texi
	doc/emacs/dired-xtra.texi
	doc/emacs/dired.texi
	doc/emacs/display.texi
	doc/emacs/emacs-xtra.texi
	doc/emacs/emacs.texi
	doc/emacs/emerge-xtra.texi
	doc/emacs/entering.texi
	doc/emacs/files.texi
	doc/emacs/fixit.texi
	doc/emacs/fortran-xtra.texi
	doc/emacs/frames.texi
	doc/emacs/glossary.texi
	doc/emacs/gnu.texi
	doc/emacs/help.texi
	doc/emacs/indent.texi
	doc/emacs/killing.texi
	doc/emacs/kmacro.texi
	doc/emacs/m-x.texi
	doc/emacs/macos.texi
	doc/emacs/maintaining.texi
	doc/emacs/major.texi
	doc/emacs/makefile.w32-in
	doc/emacs/mark.texi
	doc/emacs/mini.texi
	doc/emacs/misc.texi
	doc/emacs/msdog-xtra.texi
	doc/emacs/msdog.texi
	doc/emacs/mule.texi
	doc/emacs/picture-xtra.texi
	doc/emacs/programs.texi
	doc/emacs/regs.texi
	doc/emacs/rmail.texi
	doc/emacs/screen.texi
	doc/emacs/search.texi
	doc/emacs/sending.texi
	doc/emacs/text.texi
	doc/emacs/trouble.texi
	doc/emacs/vc-xtra.texi
	doc/emacs/vc1-xtra.texi
	doc/emacs/windows.texi
	doc/emacs/xresources.texi
	doc/lispintro/ChangeLog
	doc/lispintro/Makefile.in
	doc/lispintro/README
	doc/lispintro/cons-1.eps
	doc/lispintro/cons-2.eps
	doc/lispintro/cons-2a.eps
	doc/lispintro/cons-3.eps
	doc/lispintro/cons-4.eps
	doc/lispintro/cons-5.eps
	doc/lispintro/drawers.eps
	doc/lispintro/emacs-lisp-intro.texi
	doc/lispintro/lambda-1.eps
	doc/lispintro/lambda-2.eps
	doc/lispintro/lambda-3.eps
	doc/lispintro/makefile.w32-in
	doc/lispref/ChangeLog
	doc/lispref/Makefile.in
	doc/lispref/README
	doc/lispref/abbrevs.texi
	doc/lispref/advice.texi
	doc/lispref/anti.texi
	doc/lispref/back.texi
	doc/lispref/backups.texi
	doc/lispref/book-spine.texinfo
	doc/lispref/buffers.texi
	doc/lispref/commands.texi
	doc/lispref/compile.texi
	doc/lispref/control.texi
	doc/lispref/customize.texi
	doc/lispref/debugging.texi
	doc/lispref/display.texi
	doc/lispref/edebug.texi
	doc/lispref/elisp-covers.texi
	doc/lispref/elisp.texi
	doc/lispref/errors.texi
	doc/lispref/eval.texi
	doc/lispref/files.texi
	doc/lispref/frames.texi
	doc/lispref/functions.texi
	doc/lispref/hash.texi
	doc/lispref/help.texi
	doc/lispref/hooks.texi
	doc/lispref/internals.texi
	doc/lispref/intro.texi
	doc/lispref/keymaps.texi
	doc/lispref/lay-flat.texi
	doc/lispref/lists.texi
	doc/lispref/loading.texi
	doc/lispref/locals.texi
	doc/lispref/macros.texi
	doc/lispref/makefile.w32-in
	doc/lispref/maps.texi
	doc/lispref/markers.texi
	doc/lispref/minibuf.texi
	doc/lispref/modes.texi
	doc/lispref/nonascii.texi
	doc/lispref/numbers.texi
	doc/lispref/objects.texi
	doc/lispref/os.texi
	doc/lispref/positions.texi
	doc/lispref/processes.texi
	doc/lispref/searching.texi
	doc/lispref/sequences.texi
	doc/lispref/streams.texi
	doc/lispref/strings.texi
	doc/lispref/symbols.texi
	doc/lispref/syntax.texi
	doc/lispref/text.texi
	doc/lispref/tindex.pl
	doc/lispref/tips.texi
	doc/lispref/two-volume-cross-refs.txt
	doc/lispref/two-volume.make
	doc/lispref/two.el
	doc/lispref/variables.texi
	doc/lispref/vol1.texi
	doc/lispref/vol2.texi
	doc/lispref/windows.texi
	doc/misc/ada-mode.texi
	doc/misc/auth.texi
	doc/misc/autotype.texi
	doc/misc/calc.texi
	doc/misc/cc-mode.texi
	doc/misc/cl.texi
	doc/misc/dbus.texi
	doc/misc/dired-x.texi
	doc/misc/ebrowse.texi
	doc/misc/ede.texi
	doc/misc/ediff.texi
	doc/misc/edt.texi
	doc/misc/eieio.texi
	doc/misc/emacs-mime.texi
	doc/misc/epa.texi
	doc/misc/erc.texi
	doc/misc/eshell.texi
	doc/misc/eudc.texi
	doc/misc/flymake.texi
	doc/misc/forms.texi
	doc/misc/gnus-coding.texi
	doc/misc/gnus-faq.texi
	doc/misc/gnus-news.el
	doc/misc/gnus-news.texi
	doc/misc/gnus.texi
	doc/misc/idlwave.texi
	doc/misc/info.texi
	doc/misc/mairix-el.texi
	doc/misc/makefile.w32-in
	doc/misc/message.texi
	doc/misc/mh-e.texi
	doc/misc/newsticker.texi
	doc/misc/nxml-mode.texi
	doc/misc/org.texi
	doc/misc/pcl-cvs.texi
	doc/misc/pgg.texi
	doc/misc/rcirc.texi
	doc/misc/reftex.texi
	doc/misc/remember.texi
	doc/misc/sasl.texi
	doc/misc/sc.texi
	doc/misc/sem-user.texi
	doc/misc/semantic.texi
	doc/misc/ses.texi
	doc/misc/sieve.texi
	doc/misc/smtpmail.texi
	doc/misc/speedbar.texi
	doc/misc/tramp.texi
	doc/misc/trampver.texi
	doc/misc/url.texi
	doc/misc/vip.texi
	doc/misc/viper.texi
	doc/misc/widget.texi
	doc/misc/woman.texi
	etc/GNU
	etc/srecode/cpp.srt
	etc/srecode/default.srt
	etc/srecode/doc-cpp.srt
	etc/srecode/doc-default.srt
	etc/srecode/doc-java.srt
	etc/srecode/ede-make.srt
	etc/srecode/el.srt
	etc/srecode/getset-cpp.srt
	etc/srecode/java.srt
	etc/srecode/make.srt
	etc/srecode/template.srt
	etc/srecode/test.srt
	etc/srecode/texi.srt
	etc/srecode/wisent.srt
	test/ChangeLog
	test/bytecomp-testsuite.el
	test/cedet/cedet-utests.el
	test/cedet/ede-tests.el
	test/cedet/semantic-ia-utest.el
	test/cedet/semantic-tests.el
	test/cedet/semantic-utest-c.el
	test/cedet/semantic-utest.el
	test/cedet/srecode-tests.el
	test/cedet/tests/test.c
	test/cedet/tests/test.el
	test/cedet/tests/test.make
	test/cedet/tests/testdoublens.cpp
	test/cedet/tests/testdoublens.hpp
	test/cedet/tests/testjavacomp.java
	test/cedet/tests/testpolymorph.cpp
	test/cedet/tests/testspp.c
	test/cedet/tests/testsppreplace.c
	test/cedet/tests/testsppreplaced.c
	test/cedet/tests/testsubclass.cpp
	test/cedet/tests/testsubclass.hh
	test/cedet/tests/testtypedefs.cpp
	test/cedet/tests/testvarnames.c
	test/icalendar-testsuite.el
	test/newsticker-testsuite.el
	test/redisplay-testsuite.el